bc366978f6a44d3fd6f53106b9f1a3707247aeb9,packaging/src/main/java/org/neo4j/server/NeoServer.java,NeoServer,start,#String[]#,113

Before Change


            // Start embedded OSGi container
            String bundleDirectory = configurator.configuration().getString( OSGi_BUNDLE_DIR, "../" );
            OSGiContainer container = new OSGiContainer( bundleDirectory );
            container.startContainer();
            
            webServer.start();
            

After Change



            // Start embedded OSGi container, maybe
            boolean osgiServerShouldStart = configurator.configuration().getBoolean( ENABLE_OSGI_SERVER_PROPERTY_KEY, false );
            if ( osgiServerShouldStart )
            {
                String bundleDirectory = configurator.configuration().getString( OSGI_BUNDLE_DIR_PROPERTY_KEY, "../" );
                OSGiContainer container = new OSGiContainer( bundleDirectory );
                container.startContainer();
            }

            webServer.start();